label: Update to new GtkGestureSingle/GtkEventController defaults
authorCarlos Garnacho <carlosg@gnome.org>
Mon, 11 Aug 2014 19:52:59 +0000 (21:52 +0200)
committerCarlos Garnacho <carlosg@gnome.org>
Fri, 15 Aug 2014 11:53:39 +0000 (13:53 +0200)
GtkGestureSingle::button is set to 0 on the multipress gesture, as several
buttons are managed by that gesture. Also avoid some extra lines of code
setting what nowadays are default values.

https://bugzilla.gnome.org/show_bug.cgi?id=734285

gtk/gtklabel.c

index 189a1ae99965b5d468fb15f0c46c80f79f35dd07..906d56e9f5942ca27856536d7bb473ad8bbf2967 100644 (file)
@@ -1284,21 +1284,15 @@ gtk_label_init (GtkLabel *label)
                     G_CALLBACK (gtk_label_drag_gesture_begin), label);
   g_signal_connect (priv->drag_gesture, "drag-update",
                     G_CALLBACK (gtk_label_drag_gesture_update), label);
-  gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (priv->drag_gesture), FALSE);
   gtk_gesture_single_set_exclusive (GTK_GESTURE_SINGLE (priv->drag_gesture), TRUE);
-  gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (priv->drag_gesture), GDK_BUTTON_PRIMARY);
-  gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (priv->drag_gesture),
-                                              GTK_PHASE_BUBBLE);
 
   priv->multipress_gesture = gtk_gesture_multi_press_new (GTK_WIDGET (label));
   g_signal_connect (priv->multipress_gesture, "pressed",
                     G_CALLBACK (gtk_label_multipress_gesture_pressed), label);
   g_signal_connect (priv->multipress_gesture, "released",
                     G_CALLBACK (gtk_label_multipress_gesture_released), label);
-  gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (priv->multipress_gesture), FALSE);
+  gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (priv->multipress_gesture), 0);
   gtk_gesture_single_set_exclusive (GTK_GESTURE_SINGLE (priv->multipress_gesture), TRUE);
-  gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (priv->multipress_gesture),
-                                              GTK_PHASE_BUBBLE);
 }